bitkeeper revision 1.1174 (420ba3bb5kHKomeIcBm8uzF2u-A5dg)
authorsos22@douglas.cl.cam.ac.uk <sos22@douglas.cl.cam.ac.uk>
Thu, 10 Feb 2005 18:11:07 +0000 (18:11 +0000)
committersos22@douglas.cl.cam.ac.uk <sos22@douglas.cl.cam.ac.uk>
Thu, 10 Feb 2005 18:11:07 +0000 (18:11 +0000)
Merge douglas.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xeno.bk
into douglas.cl.cam.ac.uk:/local/scratch/sos22/xendbng/foo.bk

1  2 
xen/Rules.mk
xen/arch/x86/Makefile

diff --cc xen/Rules.mk
Simple merge
Simple merge